auto upstream
authorJoakim Verona <joakim@verona.se>
Thu, 27 Dec 2012 20:16:59 +0000 (21:16 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 27 Dec 2012 20:16:59 +0000 (21:16 +0100)

Trivial merge